Don't fail to build if info dir or dir.old doesn't exist (use rm -f).

diff --git a/debian/changelog b/debian/changelog
index 6660863a43471f46e7c2fb85c877c92580700d0b..782cb82f08453b8fd46fedcd6ad559a016886cdc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,13 @@ emacs23 (23.1+1-4) unstable; urgency=low
     Debian files.  Thanks to Michael Biebl <biebl@debian.org> for the
     report. (closes: #541173)
 
- -- Rob Browning <rlb@defaultvalue.org>  Sat, 05 Sep 2009 21:12:12 -0700
+  * Handle the fact that the share/info/emacs-VER/dir{,.old} files may
+    not be created during the install (and so may not need to be
+    removed).  This may be the case with dpkg 1.5.4 or newer.  Thanks
+    to Sven Joachim <svenjoac@gmx.de> for the report and the
+    fix. (closes: 545379)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sun, 13 Sep 2009 16:49:33 -0700
 
 emacs23 (23.1+1-3) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 773cf4a7c3d805ea6db45624074cdc494381811d..d7d1802d41643982d18e3e879a080fb8a18a582c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -781,9 +781,10 @@ install: debian/stamp/build $(autogen_install_files)
        $(pf); cd $(pkgdir_common) && \
          find -name "*.elc" | perl -pe 's/\.elc$$/\.el\.gz/o' | xargs rm -f
 
-        # Remove extraneous info dir file.
-       rm $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir
-       rm $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir.old
+        # Remove extraneous info dir files.  These may not exist if dpkg
+        # is 1.5.4 or newer.
+       rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir
+       rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir.old
 
         # Remove the shared game score directory to as a simple way to avoid
         # a conflict with other flavors of Emacs.  Since Debian's